Blender Git Loki

correct assert for customdata overlap, also quiet `uninitialized` warning in transform.

Gave the spacetype time region header malloc a more descriptive text, consistent with other header mallocs.

Code cleanup: comment referenced an outdated file path + spelling error

code cleanup: rename BLI_in_rctf() --> BLI_rctf_isect_pt(), to conform with our naming convention.

bugfix for [32368] Added controllers don't count over 10
Blender original code (NaN likely) was relying on strcmp to sort the list of controllers.
As it happens, in strcmp 10 < 2, thus the list was never in the right order.

The curious thing is that in 2.49 it worked, but I think it did because the make_unique_prop_names function was called twice. Strange ;)
The solution is to use blender BLI_natstrcmp to do natural sorting

fix [#32395] BMesh data interpolation feedback loop

style cleanup: indentation, also quiet double promotion warnings for despeckle node.

Merging r50160 through r50161 from trunk into soc-2011-tomato

Sequencer: display color sample information when mouse is holded down

Behaves in exactly the same way as image editor's color sampling.

Would be nice to display color managed color too, but that's for tomato branch.

svn merge ^/trunk/blender -r50156:50159

sequencer zooms horizontal only from mouse wheel and plus buttons.

Fix #32387: some mesh modifications breaking other shape keys.

The vertex shapekey index is now no longer copied, and propagation of offsets
in the basis to other shapekeys is disabled if new vertices were added. The
reason being that the propagation will only be done for the old vertices leaving
the new ones behind, and so doing e.g. subdivide + translate on the basis would
create a mess on other shape keys.

Merging r50149 through r50156 from trunk into soc-2011-tomato

Sequencer: fix for color balance keyframing and modifier renaming

Fix #32388: bpy.ops.wm.path_open() not working with path with spaces on Windows.

Fix #32391: new remove doubles "unselected" option was enabled by default, don't
think this was intentional.

Fix #32389: scons was compiling without iksolver and only itasc since a few days,
which gave performance issues.

code cleanup: use const weights for customdata interpolation functions

BGE: When creating a controller by linking a sensor and actuator, the created controller will always be an and controller instead of the last controller type added.

fix own error in BM_data_interp_from_edges() from recent commit.