Blender Git Commits

OpenSubdiv: Correction for the strict compiler flags

Merge branch 'master' into opensubdiv-modifier

Take care of more review points.

Merge remote-tracking branch 'origin' into soc-2014-viewport_fx

Conflicts:
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl

need to call releaseNativeHandles in GHOST_WindowX11's destructor, as well as some additional checks in GHOST_ContextGLX's destructor

Compiling intermediate files for linking c++ code from bpy_interface.c

Displist construction -- better commit it before I tear it up again

Merge remote-tracking branch 'origin' into soc

fix initial window size being too large for OSX/X11 on multiple monitors (check for X11 being used instead of not APPLE and not WIN32)

oops, some typos made it into the GLX context commit

removed some accidentally added backup files

Promoted curve.c to cpp (changed extension, added casts), moved gridmesh into blenkernel/intern, the location of the old tessellation code, and moved the GLUT debug tool into the tests folder which seems like the appropriate place for it.

Timing code (TODO: REMOVE, it's platform-specific), reorganization of coords (now stored apart from verts) for compatibility with tess code.

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

[Revision] GHOST Context Refactor for X11 (Also can compile GHOST X11 on OSX)
This is much like the CGL context in that it is fairly preliminary and does not have all the features of EGL or WGL contexts yet.
In order to work on this on OSX, some minor changes were made to CMake to link with X11 on OSX

some readability edits for ghost context classes
also added code to clear screen immediately after context creation, similar to how it is done for glX

removed apparent overly verbose conversion of int to bool in GHOST_C-api.cpp

fix: xdnd module did not compile on OSX without setting the location of X11 include files

Moved and deleted some code from GHOST Cocoa
moved locale query to the intern/locale module
deleted some odd code that did not appear to be actually used relating to command line arguments

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/transform/transform.h
source/blender/makesdna/DNA_material_types.h