Blender Git Loki

Fix T40546: Duplicate spline breaks shape keys

Bake-API: small cleanup to prevent unfreed memory when there are baking errors

Fix to be included in 2.71

Bake-API: fix for non-NORMAL maps baking black when using cage

Reported by Andy Davies (metalliandy) outside the tracker
Fix to include in 2.71

Fix T4068787 Cycles Bake Selected To Active From Non-Mesh Object Fails With Error

Users can now bake from Mesh, Font, Curve, Surface and Metaballs.
Fix to include in 2.71

Fixup for fd0b7428 Bake-API: allow custom UV to be baked

Complete last commit.

Sorry, forgot to check other uses of BKE_nurb_makeCurve, NURBS surfaces were affected as well.

Fix T40694: Curve path messed up.

Error in rB4b4bb410e04e, BKE_nurb_makeCurve() requires its coord_array to be zero'ed,
hence we need calloc here.

Fix T40637, jittering can cause the mesh to disappear.

Do not do a step when there is no collision of the brush with the mesh.

Correction to GTest commit (WITH_GTEST=OFF works now)

missed removing this in recent popup refactor

Correct error in last commit

Editmesh: add ability to show weights on wire T39054, D585

Fix blenderplayer compile...

Fix T40585, group textures cannot be selected for painting.

Issue here is that if there's a texture in the tree, chances are it has
already been set as active texture so groups are never traversed.

Now changed logic so that if a group node is active, its own active
texture takes priority over the parent group active texture.

Some WITH_TESTS weer not renamed to WITH_GTEST

GTest unit testing framework

Currently covers only small set of functionality.

Fix T40679.

Cleanest way here is not do bounding box collision for editmeshes at
all. Decision is taken because:

* Usually we want to do the snapping to the edited mesh anyway (when we
don't the mesh is skipped completely, so we don't need to worry for
extra checks)

* Bounding box is calculated from derived mesh. This means that for
subsurfed meshes for instance, the bounding box may be significantly
smaller than the size of the edit mesh.

Revert "Fix flickering when transform snapping in edit mode and cursor is"

Looks like the cleanest way to handle this is to no do bounding box collision
for edit mode at all. But this is easy to enforce

This reverts commit 7b5fe4f316234022a0ab761b694cd459ce98db2d.

Conflicts:
source/blender/editors/transform/transform_snap.c

Move tests into tests/ top-level dir

Code cleanup: use bool instead of int