Blender Git Loki

WITH_BULLET wasn't working for Makefiles.
I changed it so its tests are more inline with other defines.
Jesterking said this shouldn't affect scons so yell at him if it does. ;)

Kent

Script templates, metaball creation script from forTe, and camera script from macouno

Patch from Paprmh (Rob)

forgot to update the check for valid sequence plugin version #
(The version bump didn't affect sequence plugins so missed it)

This patch also brought the plugin includes back inline with
imbuf stuff. I'm putting it on my todo to see if we can't
remove this duplication so that this is not a reoccuring issue.

Kent

use detectable autorepeat for X11,
this way, holding a key will only give multiple down events, father then down,up,down,up.... etc.
This is needed for apricot so they can play games in blenders :)

Fix for bug #9489: particle uv coordinates were not correct
for children from particles on subsurf.

Fix for bug #9491: cancelling bake didn't reset the simulation properly,
now it also keeps the already baked frames in the cache up to the point
is was cancelled.

== FFMPEG ==

Forgot to set audio_codec correctly on output. Shame on me.

Added a check to make sure repeat value isn't 0.

bpy sequencer api can add color strips, changing strip length wasnt re-allocating stripdata which was causing memory free errors, added proxy options, directort read/write and some more flags.

Cloth: Fix point cache memory leak when duplicating cloth

svn merge -r 14236:14505 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Update of the Urainian translation
Submitted by: Serhij Dubyk

Kent

== SCONS ==
added new ffmpeg libraries to scons win32 msvc build.

Bug fix for 8634, 6708, and 5989

This replaces the hard-coded '%PROFILE%Application Data..." path
with the correct language-dependant CSIDL_APPDATA.

PLEASE NOTE!

Checks for the previous location have now been REMOVED. Any data
saved in the old hard-coded location will no longer be found by
Blender (this will only affect users of non-english windows.)

The installer has been updated to help the user to migrate their data
to the new location of their choice, if necessary.

Order of preference for .blender on windows is now the following:

1) %HOME% environment var
2) Installation Directory (location of blender.exe)
3) "Current User" (CSIDL_APPDATA)
4) "All Users" (CSIDL_COMMON_APPDATA)

Fix for bug #9487: converting particle system with dupliverts
to the new system didn't work correct.

Fix for bug #9093: array modifier merging didn't work
entirely correct after a recent bugfix.

Small fix from GSR for using pkg-config to find OpenEXR libraries

Chance wind scaling to be the same as particles

second attempt to fix compilation problem with 2D shaders on systems without GLExt or without shader support: use GL_ARB_shader_objects to conditionally compile the 2D shader code

Patch from Mario Lapin, fixes [#7394] 3ds File Import is broken