Blender Git Loki

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

Fix joining of multires meshes. The resulting mesh always has all the displacements -- if the mesh being joined to didn't have multires, it will once it's joined with a multires mesh.

these files missed the merge

Fixed rendering multires meshes. Also removed some more old multires code formerly used in rendering.

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

Added a reshape button to the multires modifier. It copies the vertices from another selected mesh into the current level. Allows indirect editing of multires levels other than the base in editmode, and more importantly allows for editing multires levels in other programs. Of course, vertex order and overall topology must match. Additionally, the copy is only exact for the first and last level. All other levels will do the usual catmull-clark subdivision.

Added a copy function for the multires modifier, so duplicating a mesh with multires works now.

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/

Started removing the old multires code. Also removed a few pointers in the DNA data that won't be needed for backwards-compat. Put a warning in the Python code as a reminder that it'll need to be updated to work with the new multires code.

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

branches/blender-2.47

Merge from trunk:
Revision: 15640
Revision: 15651
Revision: 15652
Revision: 15653
Revision: 15658

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

Fixed applying the multires modifier.

Updating for all multires levels should work now.