Blender Git Commits

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_utils.c

Add missing mask display support from subsurf.

* Add custom color for new layers.

This is not ideal because of the internal representation of byte images,
which is straight alpha. This means that on the display we will get an
opaque color if we try painting on a transparent image. To bypass this I
have enforced alpha to be 1 in that case. If we are to support this we
should upload byte images as premultiplied meaning we take a performance
hit...hmmmm...no.

* Add dependency update when painting on image editor. Should handle
update of layer icons nicely

Code cleanup: use sets

Brush Color tidy-up.

Nice UI mockup from so3Datel on blendeartists

Merge branch 'master' into bake-cycles

Code cleanup: avoid warning about bit-shift outside int range

Cycles-Bake: Internal save mode should be the default (since external is not even in the ui)

extended the critical section, hopefully this stabilizes it a bit

Fix style after old bad merge

Fix some clamping issues.

tried to increase speed by openmp, but crashes more often now, especially when freeing things (double free...) hrm

Bake api: include cleanup

Bake api: define TriTessFace verts as an array (avoids copy)

- no need to calloc hit array.
- rename smoothnormal is_smooth

Bake api cleanup: use RE_bake_ prefix.

Code cleanup: cycles baking

- remove unused headers
- respect 120 line length
- indentation
- was assigning all props to 'ot->prop' for no reason.

some cleanup ...

all "optimizations" made it actually slower, so using full copy now...

hrm bisect does not get faster...

Merge remote-tracking branch 'upstream/master' into bake-cycles

Note: as per previous 'master' commits I will need to convert the arrays
to const arrays. Campbell, were you doing that manually? or you have a
script to do so?