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

operators

Merged changes in the trunk up to revision 44612.

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

tools

style cleanup

2012-03-02 16:05:54 +00:00

bmesh_class.h

Merged changes in the trunk up to revision 44612.

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

bmesh_error.h

style cleanup

2012-03-02 16:05:54 +00:00

bmesh_operator_api.h

bmmesh api - use struct rather than int[4] to initialize mesh sizes.

2012-03-01 20:09:17 +00:00

bmesh.h

bmmesh api - use struct rather than int[4] to initialize mesh sizes.

2012-03-01 20:09:17 +00:00

CMakeLists.txt

more header re-arranging.

2012-02-28 18:28:30 +00:00

SConscript

Attempt to fix scons compilation of blenderplayer.

2012-02-22 03:16:34 +00:00