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

..

bmesh

fix bug [#30426] crash in bmesh python api.

2012-03-02 18:23:08 +00:00

generic

* bmesh py api BMEdge.verts was using 2 v1's

2012-02-26 17:20:36 +00:00

intern

Merged changes in the trunk up to revision 44612.

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

mathutils

use LIKELY/UNLIKELY macros for operations that run a lot.

2012-02-26 23:59:08 +00:00

BPY_extern.h

unify include guard defines, __$FILENAME__

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

CMakeLists.txt

initial bmesh python api.

2012-02-22 09:19:53 +00:00

rna_dump.py

Code Cleanup: check is / is not when comparing singletons.

2012-02-02 21:07:56 +00:00

SConscript

Merged changes in the trunk up to revision 44419.

2012-02-25 01:26:45 +00:00

simple_enum_gen.py

Space types:

2011-11-01 20:14:58 +00:00