Blender Git Loki

merged changes to revision 24077

Fixed support for building without collada (scons and cmake). Only tested scons.

Re-enabled collada code building by default in cmake. Realized this should be off only in trunk.

Merge from trunk -r 23000:23968.
Resolved the 'inconsistent newlines' merge error by updating my svn client.
The error was caused by a bug in svn client (http://subversion.tigris.org/issues/show_bug.cgi?id=3262) that was
fixed in 1.5.5.

Fixed conflicts in image.c, object_edit.c, wm_operators.c, source/creator/CMakeLists.txt and CMakeLists.txt.
Merge didn't remove some files that were moved/renamed in trunk, svn reported 'Skipped [filename]' on these files.
I removed them with:

svn --force remove release/io
svn --force remove release/ui
svn --force remove source/blender/editors/preview
svn --force remove source/blender/editors/physics/ed_fluidsim.c
svn --force remove source/blender/editors/physics/editparticle.c
svn --force remove source/blender/editors/physics/ed_pointcache.c
svn --force remove source/blender/editors/mesh/mesh_layers.c

Now, before merging into trunk, need to update collada code so it builds ok and fix the possibility to build without
collada.

Fix for crash when doing File -> Open, File -> New (without closing the FileBrowser first)

Toolbar Fixes:

* Restored the Grease Pencil tools to the toolbar
Probably, if the reason they were commented out before was so that the repeat stuff is visible, we can swap the order of those two. Otherwise, it's good to have somewhere for the operators now (so that the hotkeys can be found)

* Hotkey displays in the tooltips now show the keymodifier too
For example, "D LeftMouse" or "Ctrl D LeftMouse" for the Grease Pencil operators, instead of just "LeftMouse" or "Ctrl LeftMouse".

Fix minor typos.

description patch from Ron Walker

bugfix [#19719] segfault assigning a different mesh to object in edit mode

Removing unnecessary semicolon, causing compile problems with MSVC.

Bugfix to restore shape key add creating a new shape based on the
shape visible in the 3d view, rather than a copy of the basis shape.

New b.blend.
-Made it work with new tool area, resizing correctly
-Put properties tabs on the top

files missing from recent merge

More human readable formating in enums and others.
This makes some code inspection tools give cleaner results.

Cocoa / Mac:
- tablet : fix pressure retrieval => value sliding now works with tablet, UV-painting is pressure sensitive, and no more crash when clicking on window minimize button with the tablet

- update CMake file to remove unneeded folders in the app bundle (the __MACOSX stuff). From Jens' patch

Python API
----------
Incorrect row and column values were passed to newMatrixObject() by
Matrix_new() when the argument to Matrix() was a matrix.

Bugfixes:

* The python 'math' library is now included in the py-namespace used to evaluate button expressions. So it is now possible to do 'radians(somevalue)' to get a rotation value that Blender can understand...

* Shapekey path getting function now uses the appropriate wrapper for grabbing the pointer to the ID block for the ShapeKey

* Made the Graph Editor's minimum zoom size finer...

merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]

face mask mode
- border select
- linked selection (Ctrl+L)
- select all

Shape Keys

Active shape key can now be changed while in edit mode. This is based
on exit/enter editmode again in the background, which is not ideal,
as that loses the undo history. But that already happened anyway when
you did exit/change-active/enter manually.

Shape Keys

Blended shape keys can now be displayed & edited in edit mode. This
is much like showing an armature modifier in edit mode, and shape keys
now are a applied as a virtual modifier (for mesh & lattice only, curve
doesn't fit in the stack well due to tilt).

The main thing missing still is being able to switch between the active
shape key in edit mode, that's more complicated.. but the weights of
other shapes can be edited while in edit mode.

One thing to be careful about is that this does automatic crazyspace
correction, which means that if you edit a shape key with a low value,
the actual vertices will be moved to correct for that and actually move
a (potentially much) longer distance.

Also includes some UI tweaks, mainly placing some buttons horizontally
since the vertical list was getting too long.