Blender Git Loki

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

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

Some changes to OSX GHOST contexts got left out of previous separation of wanted parameters and actual parameters

(Showing My Work) Expanded GPU Module to Support Modern OpenGL

I am updating the GPU module so that it contains code needed for Blender to support a programmable shader based pipeline.

In an effort to make sure things always compile I've excluded most of the changes from 2013 that were made to gpu_codegen, gpu_draw, gpu_extensions, and gpu_material.

This new functionality is not used anywhere in Blender yet. That will come gradually.

This is a bit rough because I wanted something in the repository before evaluations. I wanted to break this into smaller more manageable pieces for code review, but that would take too much time. However, this might still work for review purposes.

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

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

Conflicts:
CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp

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

Conflicts:
source/blender/editors/io/io_rhino_import.cpp

blender build fix

Merge remote-tracking branch 'polytest/master' into soc-2014-nurbs

Moved files into position for merge with soc-2014-nurbs branch.

Fixed dropped vertex in poly creation, finished multi-poly support, better default scene.

(Revision 1) New Matrix and Vector Operations for Viewport FX

Addressed concerns:
"Using const with multi-dimensional arrays gives warnings in GCC/Clang"
"This so short that I dont think its even copyrightable, (cross product and some assignments)"
"all other functions have mul_ prefix. why difference?"

I also cleaned up some whitespace.

Have not addressed concerns about the name of scale_m4 or the generality/compatibility of translate_m4.

Began to add back in multi-poly code, squashed left-horizontal bug.

Revert "BLI_restrict macro to help the compiler optimize functions that do not allow pointer aliasing."

This reverts commit 9e402f8866794eadd49e5a024bed532ab6cf7b19.

Dammit, one more order bug and one raster bug. All 8+8 cases pass now.

Pies:

* Add pretty icons to Q menu

* Add an operator to sculpt Q pie for testing.

3rd overlapping edge order bug fixed. Pretty sure this is the last one.

Pies:

* Modify timed pie macro with own timeout property.
* Times are now counted in 100ths of second, gives more needed
precision.
* Add whole event argument to pie creation so we can spawn at custom
initial position
* Escape key also exits pie menus now.

Structures were added to store the two gradient fields.
It ended the method to calculate the two gradients fields.
The results are now shown with only two colors, so that the scalar field is represented by bands.

Merge branch 'refs/heads/master' into pie-menus