Blender Git Loki

Merge branch 'master' into opensubdiv-modifier

Boolean subtraction implemented and tested.

Bugfixes: now GridMesh can *actually* be ANDed with multiple successive polygons.

importing manta module to interpreter

Make OpenSubdiv working on a low-end video cards

This commit changes the way how mesh is being displayed when
using OpenSubdiv backend. It does no longer use neither effect
factories nor fragment shaders in order to make all the shaders
compatible with at least GLSL 1.3 compatible cards.

In fact, seems the shaders now goes down to GLSL 1.1 even.

Apart from this now the first material from the material stack
is used for colors.

Still requires our own OpenSubdiv branch:
https://github.com/Nazg-Gul/OpenSubdiv/tree/cuda-dynload

(it actually needs updated version of this branch)

Switch to a much more simplified shader

Useful to make it a base point for making stuff working on
the Intel GPU i'm having here.

Code cleanup: use Blender code style

Fix for assert failure in CUDA when using Nvidia Optimus

Merge branch 'master' into opensubdiv-modifier

Conflicts:
source/creator/CMakeLists.txt

*FAULTY* code, big commit: manta files, Cmake and Scons integration. Started work on full-cycle fluids

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

GridMesh can now handle being ANDed with multiple *successive* polygons rather than all-at-once-so-long-as-they-dont-intersect. Also, slow PIP test is avoided when possible by a more general mechanism that can propagate interior/exterior info via any grid vertex.

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

Removed unused code

Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

Updated to defaults

Merge remote-tracking branch 'origin' into soc

Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

Conflicts:
source/blender/compositor/intern/COM_MemoryBuffer.cpp
source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
source/blender/compositor/operations/COM_KeyingClipOperation.cpp
source/blender/compositor/operations/COM_RenderLayersProg.cpp

Fixed documentation of GHOST_GetSwapInterval to match new interface

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