Blender Git Loki

svn merge -r15518:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Also made shadow mesh draw in texture paint (venomGFX request)

Apricot Branch
==============

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

Apricot Branch: GLSL
====================

ATI fixes:
* Fix crash in glBitmap when rendering shadow buffers, it doesn't
seem to like using that function with only a depth buffer.
* Workaround either a bug in the driver or Blender, but I couldn't
find anything wrong, glVertexAttribPointerARB doesn't seem to
work inside display lists, so now it uses immediate mode to
create the list.
* Making deformable object for the game engine didn't check properly
if there was actually a vertex group, causing some static objects
to not use display lists.
* Also some cleanup in the game engine drawing code, replacing magic
numbers with an enum.

The apricot demo seems to runs slightly faster on a ATI HD3750 than
NVidia 8800 GTS.

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

Apricot Branch: GLSL
====================

* Some optimizations in the glsl shader code to avoid some
matrix multiplications, and other floating point ops.
* Optimized game engine mesh deforming code a bit, and
removed a bunch of unneeded/duplicated code.
* Fix for bugs #17289 and #17295, glsl compile errors.

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

Apricot Branch: GLSL
====================

* Second attemp at solving exp/log incompatibility, some compilers
don't seem to properly support preprocessor defines?
* Some simple optimizations to skip diffuse/specular/emit if they
are set to zero.

svn merge -r14639:14688 https://svn.blender.org/svnroot/bf-blender/trunk/blender/

Apricot Branch: two minor optimizations to avoid unneeded shader
and opengl light state changes.

Apricot Branch:
Bugfix to make custom glsl shaders work with blender glsl shaders.

Apricot Branch
==============

Some optimizations:
* Only Apply mesh deformer if the mesh is actually modified, once
per frame, this was done too often before.
* GLSL shader binding is now faster, only goes over dynamics inputs
instead of all of them, and frees more memory after compiling too.

Apricot Branch: GLSL
====================

* Forgot to add/remove file in list commit.
* Game engine shadow optimization, don't use shaders for
drawing into shadow buffer.

Apricot Branch: GLSL
====================

* Added a separate "Layer" option for lamp shadows, that only
restricts which objects cast shadow, instead of receive light
and shadow.
* Added exp/log compatibility for GLSL versions < 1.10.
* Check for depth texture extension before using it.

these escaped the merge

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

svn merge -r15399:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
manually merged source/gameengine

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

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

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

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