Blender Git Loki

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

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

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

Thanks for bens state level commit will be able to clean up duplicate sensors a bit :)
http://members.optusnet.com.au/cjbarton/frank_logic.png

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

error in last commit

missing NULL check when game text meshes had no vertex colors

partial merge because of conflicts
svn merge -16186:16194 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Apricot Branch: bugfix: glsl materials didn't get correct lights
when switching between blend files. Also took advantage of this
to remove some duplicate code related to accessing blender scenes.

Apricot Branch: fix for bug #17435, only first 3 texture slots were
being used for finding second uv coordinate layer.

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

* Make lights and shadows work better with dupligroups, also in
the game engine. Previously only one dupli would be created,
and shadows didn't work well at all.
* Make normal maps + stencil work.
* Some glsl refresh and default material fixes.

Apricot Branch: two bugfixes for issues with game engine draw
state switching textures and object color, showed as flickering.

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

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

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

* Added support for the realtime image "Anim" option for GLSL textures.
Note that "Tiles" is not supported, i.e. it doesn't scale the texture
for you, but that may even be desirable.
* Further there was some refactoring to remove duplicated and unused
opengl texture code for GLSL.

Apricot Branch: fix some missing updates for GLSL materials
when changing world settings. Thanks Pablo for the patch,
though I implemented it a bit differently.

small error, stopped apricot building on linux-32bit

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

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

Apricot Branch: bugfix, some meshes were not deforming anymore
after a recent commit.

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

Apricot branch: a fix for flickering alpha, with multi-material
objects. Note that sorting is only between polygons with the same
material, so which material draws first is still arbitrary, but
consistent.