Blender Git Commits

fixes to some misplaced ifdefs in GHOST_ContextGLX

basic EGL types so that glew-es compiles on OSX

fixed so that linking with libGLESv2 or libGL is based on WITH_GL_PROFILE_* and linking with libEGL is determined by WITH_GL_EGL

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

Conflicts:
intern/cycles/kernel/kernel_shader.h

Revert "Bake-API: use size_t instead of width, height"

This reverts commit 1607bcebc65fd5296f9f695e76580a1ae7ade9a2.

Bake-API: use size_t instead of width, height

* Original patch by Sergey Sharybin
* Current patch includes function to estimate a width/height when baking into multiple images

Attempt to Fix T41222 Blender gives weird ouput when baking (4096*4096) resolution on GPU

Reviewers: sergey

Subscribers: RadiationG0D

Maniphest Tasks: T41222

Differential Revision: https://developer.blender.org/D688

Merge remote-tracking branch 'origin/master' into testbuild

Revert "Squashed commit of current WIP custom split normals work."

This reverts commit f8cbd0006e5e5bf1e76c378529cda9acef099bba.

new flags for manta module

Fix for tests in X11

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

removed support for building with GLX on OSX

Support for building without glew-mx on X11

Add simple pie menu template

Fix for building with system glew

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
CMakeLists.txt

Stretch spring damping implementation.

This adds viscous damping to the stretching springs. Note that this does
not yet entirely remove the energy from the system: for this we first
need to implement the bending springs as well, which act based on
angles between hair segments.

Use the actual gravity from the scene for the hair simulation.

A new solver struct for forces has been added, this is supposed to
organize all the external influences in some consistent way.

Calculate correct segment when offsetting the pie menu.

Simulate hair in world space.

Object space is used for the DNA data, which is more suitable for tools
and object handling. For the simulation though, world space is much
better since calculating forces becomes a lot easier. Otherwise one
would have to take into account "virtual" forces generated by the
accelerated object frame of reference.