Blender Git Loki

Cycles: for material/world/lamps, if use_nodes is disabled, show some
default shaders instead of black.

Cycles: fix crash syncing curve/text object with no verts/faces.

Cycles: fix instanced mesh sync being a bit too slow.

Cycles: fix sync issue with group instances.

Button value reset:
* shortcut key changed from numpad 0 to delete.
* fix missing undo push, now it calls the operator.

Patch by Damir Prebeg, thanks!

fix for mistake in case insensitive image load.

Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/

Cycles: fix compile error for cycles_test.

fix for recent cmake changes

Make sure correct path separator is used.

svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.

svn merge -r36840:36890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

tag unused rna args.

cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.

paint_vertex.c
Tweaked get_locked_flag() so 'i' wasn't initialized twice

Fixed a problem in do_weight_paint_vertex() that involved accidentally auto normalizing a locked group incorrectly if you painted an unlocked group.

startup.blend: default ffmpeg output audio bitrate changed to 192.