Blender Git Loki

svn merge -r 16328:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r 16297:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

Apricot Branch: bugfix, setting manual glsl shaders did not release
displaylists, resulted in missing texture coordinates sometimes.

Apricot Branch: better support for multiple scenes with glsl,
now it keeps shaders and lamps per scene.

svn merge -r 16295:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r 16293:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r 16287:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender still getting errors compiling blenderplayer

Apricot Branch: didn't add these file in the last merge commit.

Apricot Branch:
svn merge -r 16266:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

Apricot Branch: bugfix for crash in shadow buffer rendering
combined with the shadow option for texfaces.

Apricot Branch: another fix for obcolor alpha - i can't seem
to get this right :).

Apricot Branch: bugfix, broke bone parenting with yesterday's commit.

Apricot Branch: still didn't get the glsl obcolor mixing right,
forgot why I did it the other way around before (because of alpha),
should work correct now.

Also, noticed I committed a bugfix before without knowing related
to creating material buckets with > 65k faces. The fix was provided
by Samuel Anjam, thanks!

divide by zero for texture animation when start and end frames are the same

svn merge -r 16246:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

Apricot Branch: apply glsl object color before mist, makes more sense.

Apricot Branch: fix for a change I made to avoid doing where_is_pose
too often, didn't work correct for multiple objects sharing the same
armature.

Apricot Branch: bugfix, crash in lights switching blender files,
accidentally removed a line of code that should have been kept.

Fix for reshape, works outside of sculptmode now.

svn merge -r 16239:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender