Blender Git Loki

code cleanup: move static mball vars into their own struct, wasnt very clear from reading code what was defined in the function.

Merged changes in the trunk up to revision 50257.

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt

missing linebreak when multithreaded gl meesage is printed to log

fix bug in mathutils.geometry.intersect_point_line() where 4D vectors were treated as 2D.

also change behavior to return a 2d vector when all args are 2D.

cleanup pixel sampler code (pixel interpolations in compositor)

fix for own crash caused by curve refactor, now curve tables are initialized once when the tree is initialized.

thanks to Antony Riakiotakis for providing a fix, though this works a little different.

code cleanup: use switch for metaball type checks and minor style cleanup

Adding despeckle as �??blender�? word...

Picky spell-checking...

Color management: display color managed RGB values in color sample line

Makes it possible to investigate color managed ranges.

Not ideal but it's the quickest thing which could be done to remove
current grading stoppers for Mango.

support unary positive operators for vectors (same as numpy), so you can do 'vector_a = +vector_b', this makes a copy.

Merging r50245 through r50247 from trunk into soc-2011-tomato

File format fixes

- Add check for header field in BMP decoder. This is needed to distinguish
whether file is indeed BMP image or not.
Without this check Blender could easily crash when it'll try to load
non-BMP image.
Tested with files from own HDD, but all of them has got BM header field,
more testing would be welcome.

- Made Jpeg2000 aware of J2K codec. Originally was needed to verify .j2c
files here in the studio, but having support of this codec would be
nice in general.
Currently supports only reading in this codec, writing would still
using jp2 codec.

svn merge ^/trunk/blender -r50240:50244

Alternate mask spline feather offset calculation method: now there are 2 [Even | Smooth]

- Even preserves thickness but can give unsightly loops
- Smooth gives nicer shape but can give unsightly feather/spline mismatch for 'S' shapes created by beziers.

This is an example where smooth works much nicer.

http://www.graphicall.org/ftp/ideasman42/mask_compare.png

Fix #31853: Marker deletion invokes strip deletion

Merging r50237 through r50240 from trunk into soc-2011-tomato

Sequencer: proper cache invalidation when deleting sequences

Solves issue with effects not being recalculated when deleting their input.

Style cleanup: spaces in sequencer scopes

Sequencer: fix crash of histogram view for float images

Overexposured pixels lead to wrong memory access in histogram making function