Blender Git Loki

Merge branch 'master' into soc-2014-bge

Merge remote-tracking branch 'upstream/master' into multiview

Conflicts:
source/blender/imbuf/intern/openexr/openexr_api.cpp

Noise settings UI

UI for UVS count

indentation method added, minor fixes

Use function binding instead of the generic PointerRNA for passing
constant arguments to operation functions.

This usually includes an ID datablock pointer and possibly some subdata
like a modifier, bone or particle system.

Note that this does not yet handle transient data that would get passed
only between operations during the depsgraph evaluation. Such a system
requires careful lifetime handling of the data and memory management.

Themify pie menu colors.

Merge branch 'master' into pie-menus

Fix undo after paint curve editing crashing on sculpt mode. Also fix bad
file write of paint curves.

More fixes for CMake, MSVC 2013, Windows 8

The hard-coded path for OpenEXR library should include the -2_1 suffix.

Added /SAFESEH:NO flag to standalone Cycles application so it can link.

The standalone Cycles application needs both debug and optimized versions of the OpenEXR libraries.

fix some layout issues and comment some unused options

Merge branch 'master' into soc-2013-paint

Conflicts:
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/uvedit/uvedit_draw.c

Removed void context pointer and generic PointerRNA arguments from the
operation functions.

These functions are now plain lambdas without any arguments. They should
be bound to the appropriate fixed arguments on construction.

indents added; correct order of wavelets restored

Use a generalized functor type for the operation eval callbacks instead
of a plain function pointer.

With std::bind the previous function pointer wrapper is also no longer
needed.

New utility header for bind and function.

Build file changes to make use of the C++11 standard.

Merge branch 'manip-fix' into soc

Merge remote-tracking branch 'origin' into soc

Merge remote-tracking branch 'origin' into manip-fix