Blender Git Loki

Better handling of obj files when writing there

Setup file handles collision objs correctly

correct file naming

exporting Collision and flow objects as .obj files

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c

Small speedup - compute hash only if there are keyblocks

Merge remote-tracking branch 'origin' into soc

Changed the subversion back to master

Versioning now uses DNA_struct_elem_find

Also, got rid of forgotten auto-commit leftover

Fixed blenderplayer link error

BGE cleanup: removing unused async logic bricks

This code was never run and is an outdated copy from the code above.
If someday this is needed again, it is better to start clean.

Utility math classes, to provide easier type wrappers around basic
BLI float arrays.

Not used currently, but could come in handy later.

Removing operation node types from the node type enum, using only the
identifier strings.

This typing was already redundant, since operations are primarily
identified by their name string. Having to pass a type enum in addition
makes it more complicated and requires taking care of the component type
association as well, without adding any real benefit.

Operations could be defined in a more compact way in a central place
though (essentially using duck-typing).

GHOST Refactor for EGL Contexts

Documentation to appear here:
http://wiki.blender.org/index.php/User:Jwilkins/VFX/GHOST_Refactor_for_EGL

Missing from this commit is support for systems other than Windows.
This also only builds with CMake.

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

Cycles: Add support for uchar4 attributes.

* This commit adds generic support for uchar4 attributes.
* Vertex Colors use this now, which reduces memory usage at the cost of a bit performance.

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

Fixed GE compile error, thanks MiikaH

Transform constraint and propcircle drawing positions update

Manipulator and constraints and prop circle are now drawn where they should be drawn: on derived cage-based positions.

http://screenshot.su/img/ef/e6/26/efe626a9a496e794c174e76ec9522736.jpg

Moved the mapping function over to crazyspace, seems a better place for them. Abstracted active element center calculation to crazyspace, too. Use scene->customdata_mask on mesh to prevent recalculating the DerivedMesh every time.

Screenshot here:

Threshold value for pie menus.

Require at least a small (adjustable in user preferences) distance from
the center of the menu before a selection can be made. Default is 5
pixels.

Fixes

* pie menus with 3 items were not aligned correctly
* clipping translation can be done if one dimension of screen is large
enough.

Pie Menu fixes - features

* Allow setting arbitrary layouts in radial regions. This can be
used to make nice arrangements of subareas in the pie menu. Only buttons
directly in a pie layout will use pie menu style collision detection,
any buttons in nested layouts will use regular collision detection.
Appended a test menu in Q key, sculpt mode.

* Allow aligning of buttons now to permit any aligned nested layouts to
properly align their buttons

* Operator enums will now spawn to a pie menu if the layout is a root
layout of radial type.