Blender Git Loki

Code cleanup: avoid sin/cos calls when drawing sun lamp

3D Text: edit menu was hidden

reduced minimum value for NDOF sensitivity to better fit the space navigator

Fix for nurbs surface merge didn't update key index

Fix issue discovered in soc-paint-2013 branch.

Weights do not need perspective correction since they are calculated on
flat triangle coordinates. Only pixel coordinates, reprojected from the
weights need this.

This was already fixed for clone brushes but in
soc-2013-paint where we have stencil preview, it is apparent that the
stencil suffered from the perspective distortion issue too.

Code cleanup: quiet warnings

Fix for wrong behavior of 'darken' blend mode with factor.

The formula was not consistent across Blender and behaved strangely, now it is
a simple linear blend between color1 and min(color1, color2).

Reviewed By: brecht

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

Fix T39940: animation of render layer on/off toggle not working during render.

Code cleanup: don't use unnecessary .exe extension in scons, simplify code.

Reviewed By: brecht

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

Fix T39942: Displacement of group instance objects when switching to textured viewport shading

Usual dupli object issue, sometimes it's needed that all the object in
dupli group have modified obmat.

Made it an utility function now, which is used by convertblender and
dupli draw code now.

Fix T39941: Freestyle: Rendered preview crashes when non-primary render layer is selected and disabled.

Freestyle relies on render layer name (RenderLayer::name) to find the render layer that
corresponds to a scene render layer being rendered.

When the active render layer is disabled during preview rendering, the function
render_result_new() populates the list of render layers (RenderResult::layers) with an
unnamed render layer while setting the active scene render layer index to zero.

This commit fixes the missing initialization of the render layer name by referring to that of
the first in the list of scene render layers.

Accidentally left compositor debug option enabled, sorry.

(We should replace that with a proper build option really)

Error in last commit

PyAPI: Matrix.invert(ed): accept an optional fallback argument

This avoids try/except when its possible the matrix has no inverse.

Reimplemented the earlier feature of swapping existing links to
neighboring sockets when connecting to an occupied input.

This now works based on socket names rather than types, which helps to
avoid unwanted connections to arbitrary sockets. Sockets are considered
swappable when their names match, based on an alphabetic prefix followed
by non-alphabetic suffix.

For example:
Image - Image : matches
Color1 - Color2 : matches (used e.g. in cycles mix nodes)
Roughness - Rotation : does not match (suffix is still alphabetic)

Fix T39936: Plane Track operation would not initialize resolutions for
upstream nodes.

Code cleanup: remove redundant matrix initialization

Correction to last commit

Fix T39614: Ping Pong Action doesn't work correctly

Fix T39939: Undo change of rB27db75363e67, which broke bevel.

The test for wire edges when reattaching was wrong, because
some newly made edges are wire at the point of the test.
This made some duplicate edges.
Need to track the original wire edges a different way.