Blender Git Loki

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

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

Added support for some world settings, updated docs.
* Ambient color
* Exposure/Range
* Mist (implementation should be optimized)

http://www.blender.org/development/current-projects/changes-since-246/realtime-glsl-materials/

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

* Made GLSL respect opaque/add/alpha/clip flags.
* Fix bug for all material types to correctly deal with
different transp flags in a single mesh.
* Also made 3d view material alpha code a bit easier to
understand.

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

* More refactoring related to opengl lights, material state switching.
Also moved init_gl_stuff into the gpu module and removed the copy in
the game engine code.
* Fixed some issues with alpha drawing of GLSL materials in the 3d
viewport, and fix a bug with alpha + xray drawing in the same scene,
it should first do alpha, then xray, otherwise alpha doesn't blend
correct with solid.

Apricot branch: missed file in last commit.

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

* Fix for crashes in last commit.
* Added "Refl" map input for textures.

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

* Refactoring in the texture and material drawing code, moving
code into the gpu module, removing the duplicated versions
in the game engine.
* Made game engine text drawing work with GLSL. It works based
on filling in the default uv layer, so it requires a texture
with the text image and mapped as uv's to work.

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

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

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

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

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

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

* Moved GLSL setting switching functions into the game engine
python API so they work in the blender player, and can do
better state switching.
* Also fixes bug #17331, error compiling with cmake.

* For the makers of test builds: it would be great if builds of
this revision or newer for various platforms could be made
available. We want to release a file to test and benchmark
GLSL on different graphics cards, and we need test builds for
this. Thanks!

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

Fix for bug #17326: normal and tangents in the game engine
were computed different than other parts of Blender, this
makes the game engine use the same code as Blender.

Fix for part of bug #17307: normal maps not working correct
in editmode in some cases.

Fix for bug #17339: a crash on ATI cards in glTexSubImage1D
due to a mistake in the code. A patch to fix this was provided
by Yong Ch, thanks!

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

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

* Made in game switching of GLSL options work. There is still
a one frame flicker that needs to be fixed.
* Added access to the estimated average framerate in the game
engine: GameLogic.getAverageFrameRate().
* Added acces to the blender build info from python:
Blender.Get("buildinfo")
* Various GLSL optimizations to allow more constant folding in
the glsl compiler, use glsl shadow functions to do shadow,
instead of own code, and fix an issue with opengl texture
color range.

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

* Added options to disable lights, shaders, shadows, ramps,
nodes and textures other than col/alpha for GLSL, in the
Game menu.
* These have python access too to switch them in game, but
it doesn't work correct yet with display lists enabled.
* Fix issue with light lagging behind, debug stats drawing in
wrong color, and a number of other small fixes.

svn merge -r15560:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Also topology mirror crashed when using smooth + mirror. use eve->hash rather them eve->tmp.l for storing edit vert indices's.

svn merge -r15549:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
- mainly to fix the free() crash with the file selector

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