Blender Git Loki

Apricot branch bugfix: texture slots changes had a bug that could make
drawing them crash.

raised maximum texture slots to 18

merge from trunk

moved snap button to ground into header until it can be integrated with snap or put elsewhere.
needed to move KX_BlenderGL.cpp include to compile

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

svn merge -r 14561:14620

make translate view zoom use grid size

fixes from trunk

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

svn merge -r 14561:14567

changes from trunk

changes from trunk

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

- Added basic cook-torrance specular to the GLSL material.

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

GLSL materials:
- Basic support for normal maps, though it looks quite flat with
the current solid mode lighting.

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

GLSL materials:
- Added the beginning of texture stack evaluation, only a few options
are supported.
- Added a few lines of code to display non-node materials, with solid
mode lighting to at least see something.

caedes needed this fix for exporting

Apricot Branch: material GLSL shaders
=====================================

- Currently only supports node-based materials, with some nodes,
main purpose of this commit is to get the infrastructure in
place, more material options will be added in the following weeks.
- Supported shader nodes: camera, curves, geometry (everything
except global and front/back), curves (partially), huesatval,
invert, mapping, math, mix/add/mult/sub/div, math, vector math,
normal, output, rgb, separate/combine rgb, squeeze, basic image
textures, value and output.
- Lights and shaders are still missing, but since the SoC project
had these working quite far it should be possible to reuse that
code.

- Enable using "GL Shaded Mode" in the user preferences. It will
replace regular shaded mode with glsl shaders.
- If the material is not node based or has an error in it, it will
revert to solid shading. Need to do this kind of error handling
better and make it posssible to still run even with some
functionality not supported.
- Integration with texture loading in textured mode is very poor,
needs to be revised.

- Only added support for Scons and Makefiles.
- Added GLEW in extern/. There were some conflicts with the game
engine opengl extensions but managed to solve them. Still, it
would be good to use single mechanism for opengl extensions.
- Added a "gpu" module in source/blender. It has quite a lot of
code with much of it uncommented as well, some of that will
become used and some it will be removed later.
- OpenGL shader code is currently converted to a C file with
datatoc (which now 0-terminates the arrays), but this has to
be done manually still, need to figure out a better way or
integrate it into the build systems.

changes from trunk

dupliGroup instance offset, so a library of objects can be stored on 1 layer without placing each groups members over the world 0,0,0 point.

Request from Chris Plush, poly reduction tool that maintains face loops and gives pradictable results for terrain, this could evolve into an UnSubsurf tool.

Currently face flipping is incorrect and UV's are lost.

merge from trunk

added comments for bad transform stuff