Blender Git Loki

Merging r49920 through r49929 from trunk into soc-2011-tomato

for the default make/cmake wrapper, use ../build_os rather then ../build/os

Collada: fixed export when 'active UV Layer only' was selected

Fix for
* [#32323] regression: Dispertion artifacts with smaller chunksizes
* [#32125] "Projector" Dispersion not working with ChunkSize < 256

dont re-use previous values for link/append operator, would get mixed up with when accessing from a key shortcut.

svn merge ^/trunk/blender -r49917:49919

escape key now quits composite.

svn merge ^/trunk/blender -r49890:49917

rendering now stops the composite job first, then renders.

use job types when checking for jobs in areas of the code that made assumptions about job types (that could be wrong)

code cleanup: use TRUE/FALSE for wm jobs

fix for missing change to fluidsim from last commit and name jobs a more useful name - 'wm_job'.

add wm job types they are not used yet, so this just defines them for new jobs add add argument to search by job type.

Cmake / Windows:
* Fix for Boost lib dir when using msvc 2010.

style cleanup: pep8 & unfinished comment from own commit.

patch [#32325] textured solid backface culling option
from Fredrik Hansson (fredrikh)

Python node operator for combined node collapsing and hiding unused sockets. Socket hide flag is added to RNA as well, but can only be set when the socket is not connected, to avoid dangling links in editor drawing. Currently this operator has no default hotkey, but can be called from the Node menu.

patch [#32327] Uniform displace modifier
from Fredrik Hansson (fredrikh)

With some edits for python UI.
The patch makes the displace modifier treat an empty texture as white.

Cmake / Windows:
* Fix for Python include path when using msvc 2010.

fix [#32299] 16bit float texture + 'Quick Edit' gives wrong result