Blender Git Loki

Fix issue with resetting active nurb when sawing from edit mode

Issue was caused by loading editNurb into normal nurbs when saving,
this used to set active nurb to NULL.

This isn't actually needed, because active nurb would be set properly
on making editNurb and even if one accessed to active spline via PY API
when object is in object it'll be completely harmless.

svn merge ^/trunk/blender -r48305:48307

mask and grease pencil now display in the dope sheet summery

Merging r48303 through r48305 from trunk into soc-2011-tomato

Optimization of keying screen node

When creating tile data include only triangles which have got intersection
with tile's rectangle only. This saves quite a lot of per-pixel iterations
through triangles which simply can not affect on current tile.

In fact, it's AABB check is used here. It could be improved further, but
it'll slowdown tile data generation with questionable speedup.

Another major slowdown is in fact caused by voronoi triangulation code.
Currently it's used naive algorithm which is O(N^2) where N is number
of edges. Added few euristics there and removed unused part of code, which
gave quite noticeable speedup already.

This could be improved further, but this node is not ment to be used for
lots of markers. It's also generates wrong triangulation when there're
many sites used. Need to be investigated further.

fix for checking wrong flag with removing mask shape keys doubles on the dope sheet.

svn merge ^/trunk/blender -r48288:48302

quiet all -Wshadow warnings in the compositor.

rename remaining class members with m_ prefix.

use m_ prefix for compositor class members (all compositor operations).

Bugfix [#31930] DopeSheet - Grease Pencil mode collapses visible channels when
switch channel

This was caused by a typo, which would end up toggling the expanded status of
the Grease Pencil datablock (gpd->flag & 4) instead of the layer active status
(gpl->flag & 4).

Merging r48284 through r48288 from trunk into soc-2011-tomato

Fixed crash when trying to perform transformation in Clip Editor without clip opened

Reported by JumboCoDeC in IRC. Thanks for the report.

make hue correct grid more faded out.

svn merge ^/trunk/blender -r48276:48283

fix for crash with blur - happened most when there was a size input, need to mutex lock before allocating the gauss array.

also add suspiciously missing call to BlurBaseOperation::initExecution, X had but Y was missing.

code cleanup

fix for [#31899] Compositor: scale to rendersize doesn't work on
separate channels

correct free command for an array in the compositor

Merging r48264 through r48276 from trunk into soc-2011-tomato