Tamito Kajiyama 9f243d531c Merged changes in the trunk up to revision 44288. ...

Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c

2012-02-21 02:19:54 +00:00

..

generic

fix for leak in gpu.export_shader(), wasnt freeing the function.

2012-02-20 22:04:29 +00:00

intern

Merged changes in the trunk up to revision 44288.

2012-02-21 02:19:54 +00:00

mathutils

unify include guard defines, __$FILENAME__

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

BPY_extern.h

unify include guard defines, __$FILENAME__

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

CMakeLists.txt

move mathutils into its own lib.

2011-07-15 04:01:47 +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 43404.

2012-01-15 23:13:12 +00:00

simple_enum_gen.py

Space types:

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