Blender Git Loki

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

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

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

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

Various cleanups and optimizations in the game engine:
* Remove some duplication in the RAS_RenderTools, and sync the blender
and game player versions. Also avoid some opengl state changes.
* Don't make separate materials for triangles and quads, this distinction
was moved to the mesh level. Also don't take some other irrelevant tface
settings into account to avoid making more materials.
* Refactoring of mesh storage, should fix wrong normals on meshes that are
reused. It also allows for joining together nearby meshes for speed, though
that's disabled still because it doesn't work together correct yet with
ome features.
* Added a distinction for game objects to be either culled or set invisible,
previously there was only one flag, which couldn't work correct.
* For parenting to bones, where_is_pose was executed multiple times per
frame, now should be once per armature.
* Fix uninitialized intertia value in the physics system.
* Various warning fixes.
* Removed some conditionals in GLSL and other minor optimizations in the
code. Also cache opengl uniform locations, and fix an invalid memory read.
* Avoid doing some math for GLSL lamps if it is not required.

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

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

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

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

apricot branch: fix a bug with the export of the second uv layer
to the game engine for GLSL.

apricot branch: svn merge -r15868:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

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

Alpha blending and sorting changes, but also include some initial
support for GLSL lamps in dupligroups (only one duplicate works at
the moment).

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

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

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

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

Apricot Branch: bugfix, don't let material ipo's update the
obcolor in the game engine, otherwise there's two ipo's
updating the same value, and which one is the final value is
undefined.

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

* Added ObColor support, though it works different than for TexFaces.
It used a new ObColor option in the materials, which will modulate
the final color/alpha with the object color and alpha, also works
in the render engine.
* Made GLSL check the ZTransp flag. A material is now only drawn
transparent if this flag is enabled, a bit more consistent with the
render engine.
* Fix for bug #17359: crash related subsurf + editmode GLSL.

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

Apricot Branch: fix for typo, no idea how this compiled with gcc..

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

these files missed the merge