Tamito Kajiyama 35708fe150 Merged changes in the trunk up to revision 44561. ...

Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c

2012-02-29 21:35:49 +00:00

..

bad_level_call_stubs

Merged changes in the trunk up to revision 44561.

2012-02-29 21:35:49 +00:00

CMakeLists.txt

Fix blenderplayer linking with recent additions to bmesh python. We should really start building with player on so that mistakes like this can be detected early.

2012-02-22 18:57:17 +00:00