Blender Git Loki

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22701:22704

missed this in last commit. keyboard event manager was stored twice.

Moved mesh display options to the 3D view n-key area, next to other display options.
The DNA/RNA for these options should be changed to reflect this.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22668:22701

- BGE, Some sensors, stored the event manager in 2 places (became confusing to do changes in this area)
- Change compiler warnings for linux/scons/C++

Tiny User Prefs tweaks. Also put the Save As Default button in header so it stays put.

use '' for enums rather then ""

2.5 MSVC projectfiles maintenance
* AUD_filefactory added.
* imbuf added to RNA include dirs.

Added extra padding for OS X at the top of the screen when opening user prefs. The window header was still getting clipped slightly behind the menu bar.

remove -Wnested-externs warning for CMake/unix, since this is used a lot, if we want to remove it can be re-enabled.
fix view3d python errors with no object/edit object.

Shift-G (select similar) is now bmeshafied for face select mode.
The patch was by Wael El Oraiby, who did a great job on it.
Yay for Wael! Commit of patch #19242.

There's also some CCGSubSurf stuff mixed in with this, though it's
still not working right (fixed tons of bugs, just the main ones
for some reason are still there, despite their original causes
being fixed :-/).

Hook Modifier Bugfixes:

Fixed some typos made in previous commit. Hook Modifier should now work correctly again (and also for newly added Hook relationships)

Notes:
* To add a hook, you currently need to perform the following steps
1) add modifier from menu (no operator in EditMode)
2) specify the object (and/or bone to use as the hook target)
3a) in EditMode, select the vertices you wish to be affected by the hook, and press 'Assign'
3b) alternatively, fill in the vertex-group field for the Vertex Group which contains the vertices to be affected
4) press 'Reset' (to make sure hook will behave correctly)
5) optionally, also press 'Recenter' if the hook position isn't right...

* BUG ALERT (Brecht/Ton): it is impossible to clear the vertexgroup/bone fields once you have assigned some value. Doing backspace+enter (or any other variation) will always result in the first item in the search menu being used.

2.5 - Timeline now updates correctly after keyframes have been edited

2.5 - Code shuffling

Moved WeightPaint/VertexPaint toggling hotkeys to the same place that the ones for PoseMode/EditMode are defined. This means that the hotkey for toggling PoseMode works again (instead of being overwritten by WeightPaint).

2.5/Vertex paint:

* Added operator for filling vertex colors with the brush color
* Pythonized the vertex paint menu

2.5/Multires:

* Disabled multires subdivide button in editmode (again)

SVN weirdness:
I already did this in r22447. Somehow it got changed back -- but I can't find any log of it getting reverted, either in my email or on p.b.o. This is extremely weird!

Added standard hotkeys for standard features like copying, cutting, pasting, saving, loading.

Saving/Loading:
Save - Ctrl S / Cmd S
Save As - Ctrl+Shift S / Cmd+Shift S
Open - Ctrl O / Cmd O
Open Recent - Ctrl+Shift O / Cmd+Shift O
New File - Ctrl N / Cmd N

Text:
Copy- Ctrl+C / Cmd+C
Cut- Ctrl+C / Cmd+C
Paste- Ctrl+V / Cmd+V
Select text- Ctrl+A / Cmd+A

Misc:
Repeat Last Op - Ctrl+R / Cmd+R
Render - Ctrl+Return / Cmd+Return
Render Animation- Shift+Ctrl+Return / Shift+Cmd+Return
User Preferences - Ctrl+Comma / Cmd+Comma
Changed the important search menu to Space key.

Old hotkeys are still preserved, at least for now.

Update Makefiles for audaspace.

This add support for: sdl, ffmpeg, openal, jack and sndfile.
We have new options:
WITH_OPENAL, default false
WITH_JACK, default false
WITH_SNDFILE, default false

and with this:
NAN_OPENAL, default /usr

NAN_JACK, default /usr
NAN_JACKCFLAGS, default -I$(NAN_JACK)/include/jack
NAN_JACKLIBS, default $(NAN_JACK)/lib/libjack.a

NAN_SNDFILE, default /usr
NAN_SNDFILECFLAGS, default -I$(NAN_SNDFILE)/include
NAN_SNDFILELIBS, default $(NAN_SNDFILE)/lib/libsndfile.

Also add two new option on source/Makefile for jack and sndfile libs,
but only for linux, so let me know for other OS.

SVN maintenance.

Audio file loading backend libsndfile!