Blender Git Loki

relay the original node to a different place holder to resolve some
crashes.

Spellfixes: colour -> color

svn merge ^/trunk/blender -r48576:48585

cycles changes:
- images that can't be loaded because of the limit are printed in the console.
- textures that can't be found show up as pink (so we know somethings wrong).

Two pass execution:
1. first pass only fast nodes are calculated and only to the active
viewer node
2. second pass all nodes to all outputs

Temp disabled highlights because of random crashes.

Highlight nodes that are being processed

Style cleanup, no functional changes

fix staic OCIO with cmake and a little correction in scons)

Merging r48575 through r48576 from trunk into soc-2011-tomato

Revert the DNA pdef_stickness -> pdef_stickiness part of r48556.

Forgot DNA needed stable names... :/ Correct spelling would involve keeping the old one for load code anyway, so better live with incorrect spelling here.

Merging r48545 through r48574 from trunk into soc-2011-tomato

Mask node: create a copy of layers to be rasterized in initExecution

This creates a list of splines to be rasterized in nitExecution which
is being called from main thread. This should resolve possible threading
issues discovered in tomato branch.

add support for scrubbing with the mouse

most keyboard events working again, but no scrub

fix error in node template and quiet warning.

make the last fix unhackish

More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize).

Minor updates.

some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs

First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).