Blender Git Loki

Extra semi-colon removed.

Fixed a build error that occurred when compiling WITH_GPU_SAFETY

Adding support for OpenGL ES 2.0 on linux.
It is not full, some stuff will be shuffle around.
Cmake file is comming up

Previous commit removed the automatic loading of glColor that I experimented with. This small change is needed for fonts to render the correct color.

WITH_GPU_SAFETY is an advanced CMake option for adding a lot of checks to help debug the graphics API.

Currently only covers usage of gpuImmediate. It is off by default. It interacts with WITH_ASSERT_ABORT in that if WITH_ASSERT_ABORT is enabled then errors cause the program to abort, otherwise they just print to the console.

BLI_utildefines.h implicitly relied on an upstream include for stdio.h, so I conditionally added it.

No scons option yet.

Changing the mesh converter to stop using BL_Material as a temporary place holder for rgb and uv data. This is the first step in getting rid of per face material conversions, which are taking up a lot of time.

BLF_draw_font calling gpuEnd too many times in some situations. BLF_draw_font does not always need a color array.

Adds recognition for Windows 7 Touch Events and a CMake WITH_INPUT_TOUCH (default off).

When INPUT_TOUCH is on, it defines _WIN32_WINNT as 0x601 (Windows 7). This is a short-term solution to enable usage for the Windows Touch API.

Removing some debug code that was accidentally committed.

When converting the VBO/UV patch to play nice with jwilkins code, I forgot to modify IndexPrimitivesMulti (I only modified IndexPrimitives). This caused MultiTexture and GLSL materials to not work with vertex arrays.

reversing an edit I did not mean to commit

Added glBegin/glEnd to GPU_deprecated.h

Fix blenderplayer compilation for cmake

fixed function return value

gpuImmediateUnlock automatically clears the vertex format

This change shouldn't have been in the last commit, so I'm reversing it.

Committing the VBO/Multi-UV patch from Cucumber. I'm putting this here since it still requires a little bit more work before going into trunk (according to Kupoman). However, I'd like to get the major Rasterizer restructuring for storage modes into this branch before people get too crazy with OpenGL refactoring. Also, I'll be making some changes to the converter soon that I hope to use the Multi-UV part of the patch to build from.

Last Merge was Incomplete, this should be the rest.

Merged w/ Trunk r46993-r46142

This merge was funny. The merge-info property was not up to date from the last merge and there were conflicts with things that should have been merged before.

I did my best to fix things up.

Workaround for MinGW32 build error