Blender Git Loki

Cleanup: whitespace

manta tun is separate thread

Cleanup: line-length and header guards

Stub hair simulation modifier to attach a hair system to an object.

The modifier should never get anything more than a hair system and
some basic access features, all the logic should be in the hair system
only.

Cleanup: style

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_WindowX11.cpp

Skeleton structs for Hair system, based on curves and points.

Cleanup: sync with master

Cleanup (sync edits with master)

Replace if -> ifdef, also some code-style

remove stdlib include from glew-mx & ensure bad args aren't passed into mxSetContext, mxDestroyContext

Cleanup and some changes needed to build on linux

Merge branch 'master' into soc-2014-viewport_context

Merge branch 'master' into soc-2014-viewport_context

setTitle should not be called until the window is valid
note: X11 and WGL do not do as extensive assertions to check if window is valid, so this only caused a problem on OSX

clearing the screen is not visible unless there is a buffer swap. also factored out the GL clear code into a single function

removed options for XInput and XF86Vidmode on OSX because they are not available for XQuartz

fix X11 error where current context was not set for window before calling swap buffers

Putting it all together: {BSpline,NURBS} values+derivates calculate & verify with Mathematica, smooth normals display properly.

fix for losing texture images after load (pink object) but this still adds the image to the inner faces unintendedly, only should affect viewport and viewport render, glsl and rendering looks ok