Blender Git Loki

Fix T46226: Bake normals multi-res crash

Fix T46227: ShapeKeys Lattice by the driver, problem updates in new depsgraph

The issue was caused by driver referencing path outside of the key datablock.

Fix T46232: Boids crash w/ random rule selection

Fix T46219: Knife cuts fail away from center

Fix T46225: Crash when rendering halo flare

Error introduced in the multiview commit.
Also bringing back the "continue" statement instead of "return", as it
was before multiview.

Fix T46222: Eyedrop picking objects inconsistently

Blender 2.76: Point submodules to new commits

Blenderplayer stubs

gpu.offscreen_object_draw()

I could not get the bContext from a PyObject, so I am instead using BPy_GetContext()

GPU Extensions: GPU_offscreen_draw()

gpu python api: PyGPUOffscreen > PyGPUOffScreen

gpu python api: move offscreen functions to their own file

Merge remote-tracking branch 'origin/master' into framebuffer

BGL: GL 3.0 methods (Framebuffer related)

Merge remote-tracking branch 'origin/master' into decklink
ce/blender/python/generic/bgl.c

Conflicts:
build_files/cmake/macros.cmake
intern/atomic/atomic_ops.h
intern/ghost/GHOST_ISystem.h
intern/ghost/GHOST_Types.h
intern/ghost/intern/GHOST_ContextGLX.cpp
intern/ghost/intern/GHOST_ContextWGL.cpp
intern/ghost/intern/GHOST_ContextWGL.h
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
intern/ghost/intern/GHOST_WindowX11.h
source/blenderplayer/CMakeLists.txt

gpu.offscreen_object_free() fix

API: gpu functions, docs

GP Sculpt: Tweak the keymaps again

* Added Ctrl-E-LMB and Shift-E-LMB to make it easier to start sculpt strokes
to make it easier to use "invert" (and soon "smooth") with these brushes.

* Removed the Ctrl-E = Modal Sculpt keymapping, to avoid conflicts with the
new additions. D+E+Sculpt still works though

style cleanup

API: new gpu.offscreen_object_*() functions

gpu.offscreen_object_bind()
gpu.offscreen_object_create()
gpu.offscreen_object_free()
gpu.offscreen_object_unbind()