Blender Git Loki

Error in last commit

revert changes to external glew-mx defines

Don't simulate the hair root.

This enforces the basic root constraint of hair curves. In principle we
could allow free, unconstrained hairs as well ...

Keep the solver over time steps during a single modifier eval.

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

fix for disabling WITH_GLEW_MX

fix for 64-bit windows

Added time stepping in the modifier, like all the other simulations do.

This is pretty crappy in general, but there is no good alternative so
far. Eventually we'd like to separate simulation stepping from the
keyframe animation system, so that simulations can be advanced
independently. This would be very useful for tweaking (in a otherwise
constant environment), doing pre-roll, setting start frame in the cache
etc.

For now this modifier update approach is just a quick hack to get
visual feedback for the integrator.

typo: used SURF instead of SURFACE, prevented panels showing up correctly

added possibility to fracture text directly

Style edits

Very basic Semi-implicit Euler integrator for hair particles.

The semi-implicit (aka symplectic) Euler integrator is almost as simple
as the basic Euler integration, but conserves Energy much better.
http://en.wikipedia.org/wiki/Semi-implicit_Euler_method

It is the integrator suggested originally in this paper:
http://graphics.pixar.com/library/CurlyHairA/paper.pdf

Time stepping operator for the hair system.

Basic solver class, to perform iterative simulation of hair (eventually).

Data from DNA can be copied into a SolverData struct for optimized
solver access. This should happen any time the data layout is changed in
the DNA (points/hairs added or removed), since the solver works on fixed
datasets only. After each time step the solver result can be applied
back to the DNA data for display, tools etc.

It may be beneficial to keep the solver and its data around between time
steps, so the data does not get deleted automatically after applying.
Initializing the data, applying and freeing are separate functions.

Macro utility for using MEM_guardedalloc in C++ hair classes.

fix for editmode selection bug, added new option "auto execute" -> enable for editing, disable for simulation

Fixed the smoothing algorithm.

The smoothing factor used for display is now exposed in RNA/modifier UI
too. This is just a debugging feature though, it doesn't really serve
any higher purpose.

Merge remote-tracking branch 'origin/master' into soc-2014-bge

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp

Progress commit: adding support for import+tessellate trim curves (mem mgt bugs).