Blender Git Loki

Merging r48981 through r48984 from trunk into soc-2011-tomato

Fixed disappearing in some circumstances feather

Real fix would be to find a point which is definitely now on loop
to be collapsed, but that's for a bit later. This commit should
remove possible stoppers.

Fixed crash caused by recent feather collapse commit

Merging r48971 through r48980 from trunk into soc-2011-tomato

Masks: feather self-intersection collapse function

This implements simple function which collapses internal loops
caused by self-intersections into a singularity.

This loops can't be removed because rasterizer expects points
of feather be aligned with points from spline itself.

Put paint mask grid allocation in a critical section

When OpenMP is enabled, memory allocation needs to be protected.

Fixes bug [#32111] Memory management regression from svn_46520
projects.blender.org/tracker/index.php?func=detail&aid=32111&group_id=9&atid=498

toggling node hide/sockets/options was triggering a re-render.

correct own error in logic for skipping mask layers, inverted mask layers with zero alpha still need to be evaluated.

svn merge ^/trunk/blender -r48967:48970

show alpha in the mask buttons item list

use calculated spline resoltion rather then fixed at 32.

svn merge ^/trunk/blender -r48961:48967

defailt to ease weight interpolation

fix for crash & leak when layer render option is disabled.

fix for occasional crash with splines a lot larger then the view

mask rasterizer - use quad interpolation - gets rid of ugly diagonal banding, introduces glitch with bowtie quads, will have to fix next.

barycentric_weights_v2_quad wasn't working quite right, rewrite as an expanded version of interp_weights_poly_v2() that cuts down duplicate calculations.

Merging r48954 through r48961 from trunk into soc-2011-tomato

Color management: resolve some of current TODOs

- Some of TODO notes were laying around but they in fact
were resolved a while ago, removed this notes form the code.

- De-duplicate input color space settings drawing in clip and
image spaces. Moved this stuff to a template which could also
be used in Python.

- Replace py-defined view transform settings panel with a
C-defined template as well. Use it in space panels and
image format settings.

- Remove display settings from color management settings
panels used by different spaces. Use window settings
instead.

Color management: display descriptions for color spaces

This descriptions are being read from ocio configuration and
exposed into UI via standard enum's tooltips.