Blender Git Loki

Color management: add "Color Unpremultiply" option for images and render settings.
For premultiplied alpha images, this makes any color space conversion for the image
or render output work on color without alpha multiplied in.

This is typically useful to avoid fringing when the image was or will be composited
over a light background. If the image will be composited over a black background on
the other hand, leaving this option off will give correct results.

In an ideal world, there should never be any color space conversion on images with
alpha, since it's undefined what to do then, but in practice it's useful to have
this option.

Patch by Troy Sobotka, with changes by me.

use PyUnicode_From_STR_String in the game engine in more places.

cucumber merge, multiline font object:
revisions: 38384,38387,38403,38404,38407,42997,42998

#42998 by dfelinto
BGE Font Object - fix for offset
(scaling also has to be taken into account here)

#42997 by dfelinto
Font Object Multiline fix.
The offset was totally wrong when object had scale[1] != 1

#38407 by kupoman
Changing the "text" property of a KX_FontObject now changes the text. This allows for control of a FontObject through logic bricks.

#38404 by kupoman
KX_FontObject now supports the x and y offset options.

#38403 by kupoman
KX_FontObject now makes use of the font's line spacing option, and correctly accounts for rotation and font size when applying the spacing.

#38387 by kupoman
The KX_FontObject text attribute is working again.

#38384 by kupoman
Primitive support for the new line character added to KX_FontObjects. The line spacing is fixed, and does not work when the FontObject is rotated. Also, the text attribute has been temporarily disabled, as it needs some updating to support the multiline changes.

formatting edits, missed these last commit.

fix [#29686] Weight paint paints when it shouldn't

disallow painting when active group is locked

patch from Jason Hays
---
Locking only redistributes or restricts weights when using bone groups.
So, in addition to adding a NULL check to my last bit of code, I made
has_locked_group() check for bone groups.

Camera tracking: improvements of track preview widget

- Enable bicybic filtering fir image displayed in track preview
- Option to show grayscale content of track preview
- When some channels are disabled, display exactly the same
content of preview image which is sending to tracker library.

Merged from tomato branch using command:
svn merge -r42382:42383 -r42384:42385 -r42394:42395
-r42397:42398 -r42398:42399 -r42406:42407
-r42410:42411 -r42417:42418 -r42471:42472
^/branches/soc-2011-tomato

svn merge ^/trunk/blender -r42973:42991

Fixed low boundary when detecting frames range for camera solver

check for presets in addons dirs. this way addons can install their own presets too.

Fix #29729: Blender crashes when camera solving with a disabled marker

Stupid mistake in index of last marker when detecting frames bounds

style edits for function declarations

minor dna header cleanup

PyAPI - remove Matrix.row_size / col_size. these were rather awkwardly named, but its more clear to use len().

mat.col_size --> len(mat.row)
mat.row_size --> len(mat.col)

weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.

improvement to how weight paint blur works
* the accumulated blur weight now takes into account how far verts are from the brush, giving more even results
* verts where the weight wasnt found were being ignored, now treat them as zero weight verts.

get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner.

also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.

while checking weight paint code noticed that unified brush functions loop over the scenes to get the flag.
* this loop is called multiple times per vertex (not addressed in this commit)
* functions like brush_use_size_pressure(), brush_use_size_pressure() called unified_settings() twice when they didnt need to.

looks like this code cant work right with multiple scenes, added a comment on this - but at least avoid calling unified_settings() multiple times in single functions.

minor edits to weight paint
* store the active vertex group (avoid doing ob->actdef-1 for every vertex)
* ensure the active vertex group isn't less then 0.

Fix: cycles camera dof object with non-uniform scale gave incorrect distance.