Blender Git Loki

Sequencer: corrections to default values of some properties

svn merge ^/trunk/blender -r49854:49867

add animation buttons to mask toolbar

add hook now has option to add to active bone (mango request).

code cleanup: includes for imbuf, also remove double promotion.

Bugfix Cloth: Hooks were broken by recent changes.

This makes it looks like if part 1 of the Dynamic Paint regression blend file fails, but actually it's correct.

fix [#32126] STAMP: Setting a background color causes color flicker

when rendering the sequencer can output float or char buffers which stamp wasn't accounting for.

fix for stamp text drawing into a color buffer not taking color management into account.

style cleanup

confusion minf/fmin, broke msvc

2d smoothview now scales back the time to move for smaller view zoom/panning.

also the compositor bounds (used for scroll bars), were only calculated when pressing the home key in 2.63, how this is updated on draw

Merging r49840 through r49854 from trunk into soc-2011-tomato

Resolve issues with color balance not updating properly in sequencer
when float images are used.

Correction to one of previous commits

Fix own mistake: Space got stripped before path

El Topo: Fix missing includes (Scons + Cmake)

inpaint node now blend inpaint pixels with existing alpha, this makes soft alpha blends inpaint look nicer.

also dont assign 1.0 alpha for parts of the image not inpaint'ed, this way you can maintain some alpha in the image.

fixed: [#32240] Collada import when nodes share geometry but not material

new parameter in assign_material() to specify where material shall be assigned: object, obdata, by userpref(default) (as discussed with ideasman_42)

avoid divide by zero for the inpaint node.