Blender Git Statistics -> Branches -> soc-2014-viewport_context

"Soc-2014-viewport_context" branch

Total commits : 86
Total committers : 3
First Commit : July 23, 2014
Latest Commit : October 7, 2014


Commits by Month

DateNumber of Commits
October, 20141
September, 20143
August, 201413
July, 201469

Committers

AuthorNumber of Commits
Jason Wilkins47
Campbell Barton37
Antonis Ryakiotakis2

Popular Files

FilenameTotal Edits
glew-mx.h18
GHOST_ContextGLX.cpp15
GHOST_ContextWGL.cpp13
GHOST_ContextEGL.cpp12
glew-mx.c12
CMakeLists.txt10
GHOST_Context.h10
GHOST_Context.cpp8
GHOST_ContextCGL.mm7
GHOST_ContextGLX.h6

Latest commits Feed

October 7, 2014, 15:39 (GMT)
Merge branch 'master' into soc-2014-viewport_context
September 16, 2014, 23:54 (GMT)
Merge branch 'master' into soc-2014-viewport_context
September 1, 2014, 15:12 (GMT)
Minor fix in GLX logic
September 1, 2014, 13:38 (GMT)
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
August 3, 2014, 18:38 (GMT)
GLX and WGL should now build when using WITH_SYSTEM_GLEW=ON or WITH_GLEW_ES=OFF
August 3, 2014, 16:38 (GMT)
Merge branch 'master' into soc-2014-viewport_context
August 2, 2014, 13:24 (GMT)
Updated extern/glew GLEW to the latest (1.10.0)
August 2, 2014, 12:05 (GMT)
missing semicolon
August 2, 2014, 12:03 (GMT)
Revert "missing semicolon"

This reverts commit 1053539f4dbe4ee83a6c689b0d385f0bf42a386d.
August 2, 2014, 11:38 (GMT)
missing semicolon
August 2, 2014, 11:32 (GMT)
added GPU_glew.h to CMakeLists.txt
August 2, 2014, 11:27 (GMT)
made GLEW_CHK extern again (ContextWGL wasn't using it and for some reason I assumed the other contexts didn't need it either)
August 2, 2014, 08:54 (GMT)
Merge branch 'master' into soc-2014-viewport_context

Conflicts:
intern/ghost/intern/GHOST_WindowWin32.cpp
August 2, 2014, 05:56 (GMT)
Remove GLEW_CHK - its not defined
August 1, 2014, 15:22 (GMT)
GLEW_CHK doesn't need to be extern
August 1, 2014, 15:01 (GMT)
* added new headers to CMakeLists
* shouldn't be a need actually to disable deprecated name mangling
August 1, 2014, 12:59 (GMT)
* moving the glew symbolic constant stuff from GPU_glew.h to glew-mx
* added header that catches deprecated OpenGL function names
July 31, 2014, 14:16 (GMT)
replaced mx macros with stubs (like previous commits in this area it is meant to reduce the noise in the next big patch review)
July 31, 2014, 14:14 (GMT)
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...
July 31, 2014, 11:10 (GMT)
Merge branch 'soc-2014-viewport_context' of git.blender.org:blender into soc-2014-viewport_context

MiikaHweb - Blender Git Statistics v1.06
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021