Blender Git Commits

Merge branch 'master' into pie-menus

OpenSubdiv: Skip some allocations when using CPU backend

OpenSubdiv: Split getCCGDerivedMesh into a smaller functions

This way it's much easier to control what's happening for which backend.

Also made it so face flags are set for all low-res faces, meaning we now
can do proper materials loops.

OpenSubdiv: Code cleanup and better function names

Fixed meshes without shape keys not being loaded on em exit

gameengine scenegraph: correction of relative postition computation, fixes T28908

Merge branch 'master' into opensubdiv-modifier

Merge branch 'master' into opensubdiv-modifier

gameengine scenegraph: whitespace and comment cleanup

In sculpt mode, new shape keys will have value = 1.0

...as per qurq's request finally!

Added Commit To Another Shape

This new operator allows you to change shapes while editing, helping if you've edited the wrong shape.

Implementation-wise had to slightly change the way editmode undo is pushed and popped, this operator messed with it. Now RealMesh keyblocks will be restored from the stored UndoMesh on undo pop.

Made debug-built blender pause on exit if there's unfreed memory

[OpenGL Policy] BlendFuncSeparate defaults to GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO

Only set the blend func if the coefficients are different. Return them to the defaults when done.

Note: Fairly confident that Blender and the standalone Cycles renderer are correct, but that both the embedded and standalone game engine will need more testing.

Note: Do we actually want the default to be: GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA?

Merge remote-tracking branch 'origin/master' into soc-2014-bge

python bge.types module - Updating documentation to close T40778

More review points taken care of.

Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx

OpenGL Extension Shims

A few things are going on with these "shims":
* OpenGL 2.0 and GLEW_ARB_shader_objects are subtly different.
* Some extensions come in ARB and OES flavors.
* GenerateMipmaps needs a workaround on ATI.
* gpu_buffer_start_update and gpu_buffer_finish_update make usage of buffer objects a bit more abstract

Any use of a shimmed function directly without the shim is caught by GPU_deprecated.h

There are also some other changes that are not related to shims that came along for the ride.

Made a mistake when rewriting GPU_material_construct_end to return bool.

#if 0'd out all of GPU_deprecated.h and turned on GPU_MANGLE_DEPRECATED by default.

Will add functions and symbols back as work progresses.

Since bgl.c uses OpenGL directly like source/blender/gpu, it disables GPU_MANGLE_DEPRECATED.