Blender Git Loki

Fix for 3d fonts loading the character of the string terminator.

also remove redundant call to wcslen and ensure FT_Init_FreeType runs
once the font loads.

3D Text: use ghash for character lookups

Fix for BKE_nurb_handles_autocalc using 2d tests on 3d data

Math Lib: add dist_squared_to_line_v2, avoids sqrt in scanfill and 3d-text

creation of path from std::string on Windows (VC10/11/12) crashes (access error)

Summary:
Seems to be a known problem in boost: https://svn.boost.org/trac/boost/ticket/6320

Applied the solution but do not know if this is the right place.

Reviewers: dingto, brecht

Reviewed By: dingto

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

Cycles: Move SIMD utility functions into its own file.

Recently added SSE macros for noise texture can be moved here as well, but I leave this for later.

Basic scons support for building with Visual Studio 2013 although full MSVC 2013 support still needs more work in scons itself

Cycles / Perlin Noise: Optimize noise calculation by using SIMD instructions on CPU.
This makes scenes with a Noise Texture render faster, the BMW file is 12-15% faster now.

Patch by Sv. Lockal, many thanks! :)

Fix T36474: Blender 2.68a crashes upon rendering

Summary:
Original issue was caused by wring detection of whether
SS modifier is being applied for render/viewport. After
recent dependency graph commit this was no longer an
issue.

But it still might have happen conflict between viewport
draw and scene_update_for_newframe() invoked from render
thread when using external engines like Cycles.

Solved by adding viewport lock while scene is being
updated and objects being exported to the render engine.

Same lock was already used for Blender Internal.

Reviewers: brecht

Reviewed By: brecht

Maniphest Tasks: T36474

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

Remove TODO. Those args could be useful in the future.

Typo fix in a comment

Code Cleanup: style

API Docs: use a simpler example for merging namespaces

Cycles / Hair: Avoid duplicate calculations and remove redundant if branch, instead add the condition to the one above.

Rigidbody: Code cleanup

Make some functions private.
Remove unneeded nested if statements.
Avoid mixing short and bool.

Rigidbody: Code cleanup

Remove redundant extern keyword.

Fix T37955: Freestyle render misalignment

Issue was caused by missing objects update for temporary
freestyle objects. This happened because of the fact that
such objects doesn't have any relations, as in they're
corresponding to root nodes in the DAG.

This situation wasn't handled by DAG_threaded_update_begin()
which considered there's only one root node in the DAG.

Fix out-of-date comment which came from DAG-MT branch

Rigidbody: Allow triangle mesh shapes to deform during simulation

Only supported when using the "Deform" mesh source.

Rigidbody: Use own structure to store mesh data for collision shapes

This gives us better access to the data and should also be faster to
create.