Those files are for the shader branch not the trunk. I'm in a cellphone now so can't revert it for Mitchell. Any volunteer?
Thanks, Dalai Nathan Letwory <[email protected]> wrote: >-----BEGIN PGP SIGNED MESSAGE----- >Hash: SHA1 > >On 14.5.2011 9:32, Mitchell Stokes wrote: >> These two files didn't get added when I created a branch from my working >> copy. > >Did you really intend to add these to trunk? It breaks building with >SCons, since these files error out. Looks like unintentional to me, or >in the very least like an incomplete merge attempt. > >/Nathan > > >> >> Added Paths: >> ----------- >> trunk/blender/source/gameengine/Ketsji/KX_PythonShaders.cpp >> trunk/blender/source/gameengine/Ketsji/KX_PythonShaders.h > >- -- >Nathan Letwory >Letwory Interactive | Studio Lumikuu >http://www.letworyinteractive.com | http://www.lumikuu.com >-----BEGIN PGP SIGNATURE----- >Version: GnuPG v1.4.10 (MingW32) >Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > >iQEcBAEBAgAGBQJNzntRAAoJEKtfN7KsE0Ttyh8IALsx24jBvEQIXsIjvCkwX0zL >R0lN3oROSQRRnICGZX6Q4a6pmjHxLY/WNMgWKdMYZArIYRAJ15i0oXmCr3zdySrU >E+sQ6O4WkuDH1gu2LiVjQ8OeoGS3GKO1WR5hm7Iq3zls8V/DvKQlknS2QT6LKe1T >lFIpdEiy+O5N8rTVkJu+hssXV4jYKy8e1TRUNR1bxMjJ3w9WZVJIpqLSTdUOK/xT >BwdCEIHf2sq8/ZNAqLjOE7kVXjxQECgOnJwBe+IX9zogBixkO3gKR1MrnCe3hpoR >Ynx9zp3+wr6/2yHYczNMBlj5z/xjDRDHVMKuaZGqrVFV7aLBb6r2Y23ZquRdjQg= >=AaSI >-----END PGP SIGNATURE----- >_______________________________________________ >Bf-committers mailing list >[email protected] >http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
