Blender Git Loki

Merge Cleanup.
Third attempt to make sure branch is a copy of trunk revision 36905. A few more fixes.

Merge Cleanup.
Second attempt to make sure branch is a copy of trunk revision 36905. Just missed a few files.

Merge Cleanup.
First attempt to make sure branch is a copy of trunk revision 36905 except for files that have for sure been edited. There are a few minor edits to the changed files but nothing functional. There will probably be a couple of more commits like this before I get a clean diff.

Merged with trunk: 34893-36905

Merged wm_operators.c with trunk. Had to set asside my on-surface brush code so I can reintegrate it later. revisions 34399-36874

Merged with trunk: 34340-34892

Merged with trunk: 33704-34399

Hand merged sculpt.c with trunk. Revisions: 31364-36811
Previous commit of paint_stroke.c was actually revisions: 30860-36797
Untested, as before this is a starting point and I'm just saving it so I can continue merging.

Hand merged from trunk paint_stroke.c revisions 30641-36811.
Doing it this way means there is no precise history of changes in my branch, but history should be preserved in trunk.
Not compiled or tested yet, just committing to get it saved separately from the rest of this merge.

Merging from trunk r36889

Merged with trunk: 33093-33703

Merged with trunk: 32509-33092

Merge with trunk: 31359-31956

Merged with trunk: 30832-31359

Creating GSoC 2011 cucumber branch.

fixes for DXF-importer script:
v1.12 - 2011.05.07 by migius
h1 fixed for SPLINE: points coordinates are always in WCS
h1 code beautifying
v1.12 - 2010.04.29 by migius
g1 preparation for non-UI-mode: import_dxf.main('dxf_file_name.dxf')

Fixing a typo:
"pPivotName" -> "PivotName"

Merging r36382 through r36528

Print an error to the user when they only specify and module and not a class. This also fixes a crash under the same conditions.

Merging r36315 through r36381