Tamito Kajiyama 9e93fc1e8a Merged changes in the trunk up to revision 44612. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h

2012-03-03 01:43:44 +00:00

..

intern

Merged changes in the trunk up to revision 44612.

2012-03-03 01:43:44 +00:00

CMakeLists.txt

Fix for invalid pointers within a copied line set.

2012-01-23 23:32:09 +00:00

SConscript

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00

WM_api.h

Code Cleanup: remove non existing function declarations.

2012-02-29 15:00:37 +00:00

wm_cursors.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

wm_draw.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

wm_event_system.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

wm_event_types.h

ndof button handling improvements: Spaceball5000's A,B,C buttons can now be keymapped, ndof modifiers (shift,alt,etc.) are almost ready but still hardcoded to act like keyboard for now. added a check to prevent crash on Linux when device is plugged in after blender starts. also fixed a bug introduced by my last commit that affected the SpaceTraveler and serial devices.

2012-02-29 02:44:08 +00:00

wm_files.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

WM_keymap.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

wm_subwindow.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

WM_types.h

Merged changes in the trunk up to revision 44221.

2012-02-18 11:26:11 +00:00

wm_window.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

wm.h

Code Cleanup: remove non existing function declarations.

2012-02-29 15:00:37 +00:00