Blender Git Loki

Merge branch 'master' into soc-2014-viewport_context

Merge branch 'master' into soc-2014-viewport_context

Minor fix in GLX logic

Merge branch 'master' into soc-2014-viewport_context

Also fix scons issues with SDL. There is still a linking problem
somewhere but i expect this is an issue in master as well.

Conflicts:
intern/cycles/SConscript
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/nodes/CMakeLists.txt

GLX and WGL should now build when using WITH_SYSTEM_GLEW=ON or WITH_GLEW_ES=OFF

Merge branch 'master' into soc-2014-viewport_context

Updated extern/glew GLEW to the latest (1.10.0)

missing semicolon

Revert "missing semicolon"

This reverts commit 1053539f4dbe4ee83a6c689b0d385f0bf42a386d.

missing semicolon

added GPU_glew.h to CMakeLists.txt

made GLEW_CHK extern again (ContextWGL wasn't using it and for some reason I assumed the other contexts didn't need it either)

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
intern/ghost/intern/GHOST_WindowWin32.cpp

Remove GLEW_CHK - its not defined

GLEW_CHK doesn't need to be extern

* added new headers to CMakeLists
* shouldn't be a need actually to disable deprecated name mangling

* moving the glew symbolic constant stuff from GPU_glew.h to glew-mx
* added header that catches deprecated OpenGL function names

replaced mx macros with stubs (like previous commits in this area it is meant to reduce the noise in the next big patch review)

this solves a couple of missing symbols when linking cycles standalong WITH_GL_EGL, but unless it is linked with a GLUT that uses EGL it isn't likely to actually work...

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