Blender Git Commits

Create sphere collision shapes for the hair point ghost objects.

NOTE: Bullet sphere collision shapes are created directly in the hair
code atm, bypassing the RBI API! This should be resolved eventually,
using the API everywhere instead of directly accessing Bullet. The
problem is that collision shapes in Bullet are an abstract base class,
the actual types are subclasses, which are difficult to handle nicely
in a C API ...

GLX and WGL should now build when using WITH_SYSTEM_GLEW=ON or WITH_GLEW_ES=OFF

scene conversion: style cleanup

Merge branch 'master' into soc-2014-viewport_context

closing file correctly

Bring back extrude menu (was removed on earlier iteration of the code,
no need to have this anymore)

Better naming for compressed keyblock vertices-related stuff

(No 'real' changes)

rename ui_pie -> ui_(but/block)_pie

set UI_RADIAL_NONE to -1 so we can use the enum to undex arrays

minor formatting

Minor edits to draw_disk_shaded

replace switches with lookups

Hide Center Points option if not in object mode

Basic support for Bullet GhostObjects in the rigidbody API and the hair
system.

These ghost objects are pure collision objects (without rigid body
dynamics) which can be used to retrieve collision info from Bullet and
use it in the hair solver.

Attempt to support retina also cleanup on identifier

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

Updated extern/glew GLEW to the latest (1.10.0)

Cycles: Avoid some NULL checks and conditions in volume sampling code.

* Avoid segment NULL check in kernel_branched_path_volume_connect_light(), we access it before the function call already.
* Avoid SD_SCATTER flag check in kernel_volume_decoupled_scatter(), we check for this before already.

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

Cleanup: Don't check ls.pdf here, we already check for it in direct_emission().